[packages_10.03.1] merge r27714, r27715