[JBJCA-1190] Add GracefulCallback support