[8.09] merge r17668