[8.09] merge r17580, r17581 and r17582