4.3.x merged back into master