Merge branch 'master' into sp_Externals