Sync with master branch

as AST support removed from master branch