Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate. Resolves SR-NNNN.