Merge branch 'origin/QA_4_8' into Weblate