Fix asset_path issue
Merge branch 'INFO-173' into dev