Merge lost branch 'release-2.4.1' into release-2.4.3