diff --git a/.phpcq.yaml.dist b/.phpcq.yaml.dist
index 1391cd5a3..dac15ddbb 100644
--- a/.phpcq.yaml.dist
+++ b/.phpcq.yaml.dist
@@ -47,6 +47,7 @@ phpcq:
     - 31C7E470E2138192
     - 5E6DDE998AB73B8E
     - A978220305CD5C32
+    - 97B02DD8E5071466
     # Composer normalize
     - C00543248C87FB13
     # phpmd
diff --git a/composer.json b/composer.json
index 93e76da13..edf244d23 100644
--- a/composer.json
+++ b/composer.json
@@ -95,7 +95,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-release/2.4.0": "2.4.x-dev"
+      "dev-master": "2.4.x-dev"
     },
     "contao": {
       "runonce": [
diff --git a/src/CoreBundle/Resources/contao/templates/mm_filteritem_datepicker.html5 b/src/CoreBundle/Resources/contao/templates/mm_filteritem_datepicker.html5
new file mode 100755
index 000000000..8781253cb
--- /dev/null
+++ b/src/CoreBundle/Resources/contao/templates/mm_filteritem_datepicker.html5
@@ -0,0 +1,27 @@
+<?php $this->extend('mm_filteritem_default'); ?>
+<?php $this->block('formlabel'); ?>
+<?php if (!$this->hide_label): ?>
+  <?= $this->label ?>
+<?php endif; ?>
+<?php $this->endblock(); ?>
+<?php $this->block('formfield'); ?>
+<?php
+$urlparam       = $this->raw['eval']['urlparam'];
+$dateMin        = null !== $this->raw['optionsMin']['key'] ? \date('Y-m-d', $this->raw['optionsMin']['key']) : '';
+$dateMax        = null !== $this->raw['optionsMax']['key'] ? \date('Y-m-d', $this->raw['optionsMax']['key']) : '';
+$placeholderMin = $this->raw['optionsMin']['value'] ?? '';
+$placeholderMax = $this->raw['optionsMax']['value'] ?? '';
+$index          = 0;
+?>
+<?php if($this->raw['eval']['fromField']): ?>
+<input type="date" name="<?= $this->urlparam ?>[]" id="ctrl_<?= $this->urlparam ?>_<?= $index ?>" class="text <?= $this->class ?>" value="<?= $this->raw['value'][$index] ?? '' ?>" placeholder="<?= $placeholderMin ?>" title="<?= $this->raw['eval']['labelFrom'] ?>: <?= $placeholderMin ?>" min="<?= $dateMin ?>" max="<?= $dateMax ?>">
+<?php endif; ?>
+<?php
+if (2 === $this->raw['eval']['size']) {
+  $index = 1;
+}
+?>
+<?php if($this->raw['eval']['toField']): ?>
+<input type="date" name="<?= $this->urlparam ?>[]" id="ctrl_<?= $this->urlparam ?>_<?= $index ?>" class="text <?= $this->class ?>" value="<?= $this->raw['value'][$index] ?? '' ?>" placeholder="<?= $placeholderMax ?>" title="<?= $this->raw['eval']['labelTo'] ?>: <?= $placeholderMax ?>" min="<?= $dateMin ?>" max="<?= $dateMax ?>">
+<?php endif; ?>
+<?php $this->endblock(); ?>