[Issue #370][MC] Pulled master