[packages_10.03.2] distribute: merge r28216, r28396, r28402, r28424