[Updater + Item] int to long
Merge remote-tracking branch 'origin/master'