Merge branch '2.0-asset-path' into 2.0-glebm