Merge "Initial implementation of IMapper 5"