Directions task fix
Merge remote-tracking branch 'origin/wimcDev' into wimcDev