LPS-45557 This goes logically together