Merge branch 'master' into v1.3.0