Merge change 4017 into donut

* changes:
  Make the date format preference work again.