Expand the scope between before_vcs
and after_vcs
#6015
Merged
before_vcs
and after_vcs
#6015