Fix asset manager
Merge branch 'release/0.0.7'