Merge branch 'gs/usage-to-stdout' into next