[packages_10.03.2] re: merge r28754, r29791, r29793, r29799, r29816, r29819