bugid:96496 hubs slot for evolve
Merge remote-tracking branch 'origin/dev' into dev