2.3/dev - Fix / improve datetime field type