Merge branch 'master' into brapi1.3