TRN-368 Implementation complete including tests.