A fork to work on security token patches