am 3641ac7d: Merge "Add missing class initialization during compilation and tests"

* commit '3641ac7de8b51c0853eaaa2ba3a3ab7e65a837c5':
  Add missing class initialization during compilation and tests