Cleanup and small refactoring
Fixed that nasty bug. With transaction account to.
Also Updated backup exported and imported to avoid that issue
Prepared for dev
Merge branch 'dev' into dev.security