Merge branch 'qa-test-feature-6741ffbf40bdfb69' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 93086e9e)

6b3c7f50 This is a test commit