Merge branch 'master' into uta/complete-statement