Branch: ENG-625_scope-merge-vars-to-content#55fb711