Merge remote-tracking branch 'upstream/dev' into APC. Updates map with new SMES variable names.