New feature assets tracking
Merge branch 'feature-assets_tracking' into develop