Merge branch 'qa-test-feature-9e28a51d686554ff' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit c61b4629)

b34c391d This is a test commit