Port contao/core@bd81110b0385d64a85293f9faca38b83488b6180