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

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 6bf9a862)

745994b7 This is a test commit