LPS-39169

Hey @jonmak08, I did not rebase this branch because the latest build was not compiling. Let me know if you have any questions about this fix. Thanks