Added syntax for using Scope instead of transaction. Partial checkin, old code is still working.
Merge branch 'issue/2403_lite' into develop