CW-534 Code cleanup related wiki articles
Merge remote-tracking branch 'origin/release-R1-bugfix-S4' into develop