Minor stuff
Merge branch 'assets_listener' into development