Merge "Fix a concurrent issue in reload()."