Hot index locking

#1035