Merged changes from 4.2.x branch again