Merge branch 'master' into bug/fix-invalid-annotations