Merge branch 'master' into v1.3.0
Merge branch 'master' into v1.3.0
Merge branch 'v1.3.0' into issue-196