Merge branch 'qa-test-feature-454a64326485de3d' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 8611820c)

8595d546 This is a test commit