These fixes are required for us to switch to the Zeitwerk autoloader
Attach a file by drag & drop or click to upload
