Merge "[Cherry-pick] Group methods with similar purpose." into main