Merge branch 'qa-test-feature-20a2b8d2c59f2e46' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 25067b69)

f90c9e02 This is a test commit