diff --git a/be/src/exprs/timestamp_functions.cpp b/be/src/exprs/timestamp_functions.cpp
index 732a04efb5..c1acd0f1e5 100644
--- a/be/src/exprs/timestamp_functions.cpp
+++ b/be/src/exprs/timestamp_functions.cpp
@@ -62,6 +62,32 @@ bool TimestampFunctions::check_format(const StringVal& format, DateTimeValue& t)
     return false;
 }
 
+StringVal TimestampFunctions::convert_format(FunctionContext* ctx, const StringVal& format) {
+    switch (format.len) {
+    case 8:
+        if (strncmp((const char*)format.ptr, "yyyyMMdd", 8) == 0) {
+            std::string tmp("%Y%m%d");
+            return AnyValUtil::from_string_temp(ctx, tmp);
+        }
+        break;
+    case 10:
+        if (strncmp((const char*)format.ptr, "yyyy-MM-dd", 10) == 0) {
+            std::string tmp("%Y-%m-%d");
+            return AnyValUtil::from_string_temp(ctx, tmp);
+        }
+        break;
+    case 19:
+        if (strncmp((const char*)format.ptr, "yyyy-MM-dd HH:mm:ss", 19) == 0) {
+            std::string tmp("%Y-%m-%d %H:%i:%s");
+            return AnyValUtil::from_string_temp(ctx, tmp);
+        }
+        break;
+    default:
+        break;
+    }
+    return format;
+}
+
 void TimestampFunctions::report_bad_format(const StringVal* format) {
     std::string format_str((char *)format->ptr, format->len);
     // LOG(WARNING) << "Bad date/time conversion format: " << format_str
@@ -334,8 +360,11 @@ StringVal TimestampFunctions::date_format(
     if (ts_value.compute_format_len((const char*)format.ptr, format.len) >= 128) {
         return StringVal::null();
     }
+
+    StringVal new_fmt = convert_format(ctx, format);
+
     char buf[128];
-    if (!ts_value.to_format_string((const char*)format.ptr, format.len, buf)) {
+    if (!ts_value.to_format_string((const char*)new_fmt.ptr, new_fmt.len, buf)) {
         return StringVal::null();
     }
     return AnyValUtil::from_string_temp(ctx, buf);
@@ -369,7 +398,7 @@ DoubleVal TimestampFunctions::time_diff(
     if (ts_val1.is_null || ts_val2.is_null) {
         return DoubleVal::null();
     }
-    
+
     const DateTimeValue& ts_value1 = DateTimeValue::from_datetime_val(ts_val1);
     const DateTimeValue& ts_value2 = DateTimeValue::from_datetime_val(ts_val2);
     return DoubleVal(ts_value1.second_diff(ts_value2));
@@ -417,8 +446,10 @@ StringVal TimestampFunctions::from_unix(
         return StringVal::null();
     }
 
+    StringVal new_fmt = convert_format(context, fmt);
+
     char buf[128];
-    if (!dtv.to_format_string((const char*)fmt.ptr, fmt.len, buf)) {
+    if (!dtv.to_format_string((const char*)new_fmt.ptr, new_fmt.len, buf)) {
         return StringVal::null();
     }
     return AnyValUtil::from_string_temp(context, buf);
@@ -455,7 +486,7 @@ IntVal TimestampFunctions::to_unix(
         return IntVal::null();
     }
     const DateTimeValue &tv = DateTimeValue::from_datetime_val(ts_val);
-    
+
     int64_t timestamp;
     if(!tv.unix_timestamp(&timestamp, context->impl()->state()->timezone())) {
         return IntVal::null();
@@ -526,7 +557,7 @@ DateTimeVal TimestampFunctions::convert_tz(FunctionContext* ctx, const DateTimeV
     if (!ts_value2.from_unixtime(timestamp, std::string((char *)to_tz.ptr, to_tz.len))) {
         return DateTimeVal::null();
     }
-    
+
     DateTimeVal return_val;
     ts_value2.to_datetime_val(&return_val);
     return return_val;
diff --git a/be/src/exprs/timestamp_functions.h b/be/src/exprs/timestamp_functions.h
index df6c04b77d..317d496574 100644
--- a/be/src/exprs/timestamp_functions.h
+++ b/be/src/exprs/timestamp_functions.h
@@ -167,6 +167,10 @@ public:
     // TODO: eventually return format converted from Java to Boost.
     static bool check_format(const StringVal& format, DateTimeValue& t);
 
+    // In order to support 0.11 grayscale upgrade
+    // Todo(kks): remove this method when 0.12 release
+    static StringVal convert_format(doris_udf::FunctionContext* ctx, const StringVal& format);
+
     // Issue a warning for a bad format string.
     static void report_bad_format(const StringVal* format);
 };
diff --git a/fe/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java b/fe/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java
index 247d3514ad..6e61fd733d 100644
--- a/fe/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java
+++ b/fe/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java
@@ -644,7 +644,8 @@ public class FunctionCallExpr extends Expr {
             throw new AnalysisException(getFunctionNotFoundError(collectChildReturnTypes()));
         }
 
-        if (fnName.getFunction().equalsIgnoreCase("from_unixtime")) {
+        if (fnName.getFunction().equalsIgnoreCase("from_unixtime")
+        || fnName.getFunction().equalsIgnoreCase("date_format")) {
             // if has only one child, it has default time format: yyyy-MM-dd HH:mm:ss.SSSSSS
             if (children.size() > 1) {
                 final StringLiteral fmtLiteral = (StringLiteral) children.get(1);