Draft: Rebase to newest main-jh branch

Qian Zhang (Gary)requested to merge
replace-gemfile into main-jh

合并请求报告