MOB-533 Fix WM TOC
(cherry picked from commit 97cee6c)