Sync Master PioneerSS and others minimal changes