Update to match refactored C++ implementation.
Authored by: jsb1685 2020-11-23
Parent: [r5261]
Child: [r5263]