Fixed invalid paths
Merge remote-tracking branch 'origin/MWEB-979' into MWEB-979