Merge branch 'eeprom-new'