Upstream Sync

- tweak "if" syntax