Merge from expl_inc