Fixes from ticket 11223 (rebased onto develop)



This is the same as gh-421 but rebased onto develop.

----

Addresses points raised in rebased PR referenced on ticket 11223, and some other rephrasing and formatting stuff I noticed in the same files.

To be rebased to develop once merged.