Merge "Set correct default date format for ce"