Merge "Adding changes for catalog edit and create"