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

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit a8e83fd9)

b64c70d4 This is a test commit