merge from 5.3.1 branch