Interim checkin to share code with team to allow AutoMapper share