Olivier Massot 411046ac32 fix merge conflicts 2 anni fa
..
abilities 58424a85e7 v8-5075_fixes_after_tests_2 2 anni fa
theme.ts 91e3e1af63 various post-upgrade fixes 2 anni fa