Issue 1727 review

testing