Merge "Don't assume R class fields are constants" into main