Re #10681 Fixed unit tests fixed locally a while ago.
Merge branch 'feature/10681_RedWrapper' into develop