Merge branch 'sg/test-with-stdin'