Merge branch 'qa-test-feature-04c77cbd5aa6268f' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 4756ab25)

9db448a7 This is a test commit