Merge branch 'qa-test-feature-9378e35e8e73bf7c' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit a535da95)

26f3e8ff This is a test commit