Merge updater + fix
Merge updater + fix (2)