Output-flushing
Merge branch 'master' into output-flushing
iteration test fix