Merge branch 'qa-test-feature-2170f89ae3eec13a' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit c03f264d)

27b9712b This is a test commit