merge 1.4.7 changes