Rationale for this change

What changes are included in this PR?

Are these changes tested?

Are there any user-facing changes?