Merge "Avoid initialization race condition"