Port the changes from contao/core@79d45a9f4dac02c3078a55fc531c746bce8e2c4f