[packages_10.03.2] scmpc: merge r28968, r29199