Merge "Fix inconsistent default value type"