Merge branch 'master' into fix-milestone-snippet-header