Merge "Mapper_2_0 Junits"