Future ES8326 changes depend on already applied fixes, merge up the fixes so we can do the new things.