remove closure typehint where it's not applicable
Merge remote-tracking branch 'origin/dev' into dev