Added a check that the correct target is being used
Merge origin/Vision into Vision