[packages_10.03.2] kissdx: merge r28965, r29199