Merge branch 'qa-test-feature-5fb76e8d770e87f2' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit db599b62)

da3389d0 This is a test commit