Draft: Trusted akprasad/crs catalog update