Merge branch 'rc-4.3.1'