Merge branch 'mhi-net-immutable' into mhi-next