Merge "Bugfix: fix the CI failure for compass and joid"