Merge branch 'qa-test-feature-5b2cbf2e320ae57f' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 16a47551)

e5e4574f This is a test commit