Merge branch 'issue1658'.