library transaction manager
Merge branch 'master' into development

Master Merge