Sync Master PioneerSS and remove #3075