[Dev] When the location is a code, set the corrected key-word to that code.
Merge branch 'trunk' into releases