LPS-44895 Fix the build regression caused by increasing dependency on the Registry impl
LPS-44895 Sort
LPS-44895 SF
LPS-44880 SF
LPS-44623 SF