merge updater with savchenkov changes