Merged master into AOP
Fixes after merge