Added setting for assets listener
Merge branch 'assets_listener' into development