Removed transaction manager and aop proxy ref
Merge branch 'master' into features/TS