Merge branch 'master' into 361-core