Merge branch '3696_uzoo_datetime_format'