[packages_10.03.1] merge r27682, r27683