Merge branch 'master' into always-on