Merge branch 'update-cray-config'
Merge branch 'master' into develop