Merge "Fix default constructor"