update callback signatures to be consistent
adds params
Merge remote-tracking branch 'origin/v0.6.0' into v0.6.0
lint