LPS-47161 moved to core