Rationale for this change

Are these changes tested?

Are there any user-facing changes?