Merge ChangeSet@1.12: Add test case for -H