Fork 1566 changes. New eliminatecandidate, timewarp fix, trusted hashtablelookup,