Merge remote-tracking branch 'origin/master' into gxv738_sco
Rename TEMP_FILES_DIR to TEMP_FILES_DIR_
Merge remote-tracking branch 'remotes/gxv738/gxv738_sco'