Merge "Simplistic fix for initialization race" into klp-dev