Merge "Add missing class initialization during compilation and tests"