Merge branch 'develop' into feature-rop
update to antlr4 (tests not migrated yet)
speed up parser
Merge branch 'feature-rop' into develop