LPS-44121 Moved into core