Merge branch 'qa-test-feature-61f0d1e18eac7c7b' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 1bee956b)

afb7a4ab This is a test commit