I assume that these changes are actually part of the previous (API uniformisation) change, not part of this one?