[packages_10.03.2] merge r31318