Merge "Fix function annotiation"