calling_format should not be None, so avoid sending unnecessary keywords (RBL-8174)
calling_format should not be None, so avoid sending unnecessary keywords (RBL-8174)

sassoftware/catalog-service,sassoftware/catalog-service,sassoftware/catalog-service