Update to v0.6.21

Carl Smedstadrequested to merge
update-etc into main

Also, some refactoring/reformatting - see commit message.

Edited by Carl Smedstad

Merge request reports