github: resolve conflict from cherry-pick 6fa698899b63a410a0d61b551815dbd69034dd0e