Merge auto update

Will be disabled by default