Merge 1.7.2-SNAPSHOT in develop.