LPS-26751

Hey Brian, this still requires some massaging, but since there is a large codebased it would be ideal to not delay longer in committing the initial changes.