Add changes from master to 4.2