Also updates AutoExtendClaimTask with new API, will need to ensure users are using a recent build of CB