Merge "Fix for date formater"