fix bugs preventing the closing of wikis
Merge branch 'bugid-99650-2' into release-154