Merge "Bug 1125: Added regression test"