Update #2600456 to merge request, reroll, and resolve latest test failures. If tests successful, should close #2600456