Feature #5033:modify format