Merge branch 'release-v4.0.3'