Commit 3e731aa7 authored by wind2009's avatar wind2009

Merge branch 'master' into 'master'

Fix 7031&7032

See merge request mycard/pre-release-database-cdb!96
parents 9bdd7d88 18faa6c1
Pipeline #29154 passed with stages
in 1 minute and 34 seconds