Merge branch 'qa-test-feature-2d7145bc95d93d4d' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 9724d0f9)

55517e4c This is a test commit