LPS-48559 - Toolkit Registry'fy