am edd0a6db: Merge "Fix some global constructors and destructors"

* commit 'edd0a6dbe26bb334f02d5abe649e3da9165277b2':
  Fix some global constructors and destructors