EB-8319 - Changes made for Anonymous Catalog.