initial commit backported and modified account_asset v.2