Merge "Make sure that global variables are initialized lazily." into devel/master