another commit. Re #1234.
More work.
Commit some more. Re #9999
Merge remote branch 'origin/feature/9999_a_great_work'