Don't use C++ keywords with scintilla (for the source code view).
Merge development changes into user action recording feature branch.