Re #10681 Minor comments
Merge branch 'feature/10681_RedWrapper' into develop