Merge branch 'hashmap_iter_bucket_lock_fix'