[packages_10.03.2] reaim: merge r28966