Merges the new changes from the master with some modifications to make Comfy follow the OCI compliance