20230309 editorial improvements See merge request !491
mentioned in issue #372 (closed)
mentioned in issue #375 (closed)