Merge branch 'qa-test-feature-c4b02277558e72c5' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit fb20dcd5)

d60a91ec This is a test commit