Improved performance of AliasesParser
Merge branch 'aliasesParserImprovement' into develop