Revert case
Merge remote-tracking branch 'origin/mmc_dispatch_interop' into mmc_dispatch_interop