Commit some more. Re #9999
Merge branch 'feature/9999_a_great_work' into develop