more work on pp4
Merge branch 'master' of https://github.com/micktaiwan/scpm into factory_master