Merge commit '01c553a' into QA_4_2
Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
Translated using Weblate (Estonian)

Currently translated at 100.0% (2768 of 2768)

[ci skip]
Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Merge commit 'c0548df'
Merge commit 'e38891f'
Fix tests

Signed-off-by: Marc Delisle <marc@infomarc.info>