BAC-1234 applying WMF security fix for bug 60339

(cherry picked from commit 1a86f3d40bb0fc557e126f7b499171f83499a730)