Merge branch 'master' into yaz-744