Merge branch 'master' into path-notifications