Merge "Fix return typehint"