Merge branch 'qa-test-feature-7caff0f26e224c62' into 'development'

QA test - merge request

See merge request !1 (merged)

(cherry picked from commit 8205b37b)

c2934a2e This is a test commit

Co-authored-by: GitLab Qa-bot jihu-qa@gitlab.cn