simplify AssetRegistration
Merge pull request #3437 from timoschilling/simplify_asset_registration

simplify AssetRegistration