LPS-46815 moved to core as modules