Merge "Fix inconsistent type of default value"