[packages_10.03.1] merge r27798, r27799