Merge "changes: Fix wrong typehint"