CW-534 Fixed manual wiki articles not handled properly
Merge branch 'release-R1-bugfix-S4' into develop