Merge branch 'cb/do-not-pretend-to-hijack-long-help'