Merge branch 'rm-fix-formatting' into 'master'

Apply formatting and fix CI job

See merge request !330
2 jobs for master in 29 seconds (queued for 1 second)