[packages_10.03.2] cmdpad: merge r28930, r29199