Anishek / Ashwin | #2193 | Conditionally syncing views