Merge 4.2.3 1.7.2 update into master