Merge "Fix type annotation"