[packages_10.03.2] gw6c: merge r28923, r29199