Syntax highlighting for Python annotations
Merge work changes