hm, maybe re-propose this branch to merge into master_sync?  that way I see just your changes.