Merge branch 'ap/dateformat'