Merge branch 'formatting_ISAR' into 'main'

ISAR formatting and formal improvements

See merge request !1527