[Fixes #55553782]
Merge committ
Merge branch 'develop' of github.com:camsys/oneclick into develop
Merge branch 'develop' of github.com:camsys/oneclick into develop