Re #10681 Minor comments and bugs found while changing system tests
Merge branch 'feature/10681_RedWrapper' into develop