Merge branch 'qa-test-feature-22e09d187e90f3f9' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 849f4f09)

0db0d2a6 This is a test commit