Merge "[ToA] Update configuration when the file is loaded after reboot" into main