Merge "Fix bug in WaitForCompilationToFinish"