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

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 9ddb3090)

62ad16df This is a test commit