Merge in latest Release/4.2 Changes