Merge branch 'mt/test-lib-bundled-short-options'