My thought is to use it a separate "preview" branch where it's enabled. After changes are finalized merge the updates into the main branch.