Merge pull request #8793 from breadoven/abo_cms_eeprom_save_fix