Merge "Replacing ModelMapper with MapStruct"