Backporting CB-4521