Merge remote-tracking branch 'origin/4.3.x' into wfk24