Substantially better wording from review (3.2.0 port of 3732 2/2)

Co-authored-by: Ralf Handl <ralf.handl@sap.com>