Add changes from master to 4.2
Merge branch '4.2'