Merge branch 'test-iteration-1'
Revert "Merge branch 'test-iteration-1'"

This reverts commit cc7a964c9f0dc12d2992a47c3dc5c23e771df581, reversing
changes made to 4d02872add31e33d9f69ed9cfd1daedceb6af696.
changes to master
Merge branch 'master' into test-iteration-1