Lost changes to ConcurrentHashTable indexing bug fix. Take care while rebasing..