Merge branches 'master' and 'devAST'
Merge branches 'master' and 'devAST'
Merge branches 'master' and 'devAST'
Merge branches 'devAST' and 'master' into devAST
added few more things for AST