Merge pull request #758 from actions/juxtin/prepare-4.3.1

Merge pull request #758 from actions/juxtin/prepare-4.3.1 #1316