merge commit from 1.3.x