Merge 1.5.2 change back to master.