Merge branch 'develop' into 'f10096-datepicker-cr'

# Conflicts:
#   extension/Classes/Core/AbstractBuildForm.php
2 jobs for f10096-datepicker-cr in 3 minutes (queued for 2 minutes and 53 seconds)