fix asset import
Merge branch 'rc/unstable/1.11.90' into 1.12