I was not able to get the changes to apply cleanly to the 4.2 branch. But I applied to master and 4.3 branches. Thanks for working on this Lukasz.