Stable merge

This is to check the merge from stable/1.6.x into master. If it is ok, we can push the merge commit directly.