[MC][issue #178] merge conflicts

issue #178 
@karimngr please review