Fix build break.
Merge branch 'master' into clean_up_goals