Merge branch 'master' into lt/apply