Merge "IMapper 5 - the Stable C approach"