vice-versa status handling.
Refactoring and cleanup.
Merge branch 'dev' into new-assets-parsing