[packages_10.03.1] merge r27673, r27678