Merge branch 'master' into fix-boundary-emptiness-check