Switch staging deployment back to master [ci skip]
Fix asset display ID migration
Cleanup and better fallback
Add blank option for asset display