Merge "Avoid deadlock during boot up"