update a couple long > int
Merge remote-tracking branch 'origin/041-dev' into 042-dev
Merge remote-tracking branch 'origin/042-dev' into 041-dev