Merged mcs / fixed failing unit test.