Merge branch 'bug1653'