Merge branch 'master' into lifecycle-fixes