Merge branch 'qa-test-feature-4c7e6f6ca257ca11' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 567a0504)

8302f1fd This is a test commit