Merge branch 'sg/doc-test-must-fail-args' into maint