Merge branch 'master' into entry