cgrant changes merged