Merge "Adding Some Files and TestCases in Mapper"