EEPROM preparation for issue #502