Merge branch 'ps/revision-stdin-with-options'