Fix for initial Goal Tracker visit
Merge branch 'MH-637-gt' into dev