CVJ-128: Fixed some issues with custodian flag.