Merge branch 'master' into LEGAL-644