Merge branch 'qa-test-feature-8d829238a84bbeef' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit c2d9baea)

7db08180 This is a test commit