Merge branch issue1676.