Merge branch 'qa-test-feature-08a75c91ab8adb22' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 9485a6fa)

2f3a1ce4 This is a test commit