Sucessful merge from 2b3c(v1.55) into v1.60