Done, test passing - need to manually validate test results.
Merged to master, still need manual validation.