Update dependencies
FIX: types
Catch up
Catch up
Merge remote-tracking branch 'origin/i0016'