Merge branch 'master' into loop-nonempty-checks