Automatic merge from submit-queue (batch tested with PRs 39217, 40624) Allow StorageFactory to wrap encoders and decoders
