Merge "Fixed the issue "set default" is not shown"