Merge branch release/4.0 into dev

Mixed double and single quotes.<br>'$location' is not defined.