Merge "Remove empty default constructor"