Merge pull request #1267 from yuhunglin/CLC-2111

[CLC-2111] Minor follow-up fixes
[CLC-1676] Testing out asset_host sharding