[8.09] merge r17571 and r17572