Changed handling of implicit transaction to avoid creating unnecessary objects.
Merge branch 'pokerdemo_fixes' into develop