Merge branch 'feature/asset-pipeline'