Further, general build fix for branch 4.3
Merge remote-tracking branch 'origin/4.3' into 4.3