Still more bugfixes.

Nicolas Tancogne-Dejeanrequested to merge
fix_bugs_codex_9 into hotfix-16.4

Description

Still more bugfixes.

Checklist

  • I have checked that my code follows the Octopus coding standards
  • I have added tests for all the new features added in this request.

Merge request reports