merge 1.5.1 changes