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

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 66fba773)

4371be52 This is a test commit