Special branches

Defensive guard for syncing / shipping special branches.
Same here. Verify that syncing normal branches still works.