Fixes #3638: Please move mxm fix to v1.6

---svn-pre-commit-ignore-below---

r28648 [[BR]]
fix: detect threading model to take appropriate flow in mxm