Merge branch 'master' into scs_pac