Merge branch 'qa-test-feature-9a52e987adfeed5b' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 6008b02b)

738ca8f5 This is a test commit