Ensure connected renderer list is complete
Sync (master) update 1
Sync (master) update 2: port new header matching scheme