common6.4 See merge request o2oa/o2oa!5446 (cherry picked from commit 64e63dce) 13c06a04 common6.4 6f0c4861 v6.2.x
