GRAS-1233 updates due to API change