Merge branch 'qa-test-feature-c74761bba1237a17' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 8c3e20f9)

39dece4b This is a test commit