Merging PR #707