Implement Website name check
Fix #2261 and Fix #2272
Fix failed UTs
Merge pull request #2274 from ogail/check

Implement Website name check
Fix API names
Cutoff the Singleton
Apply CR
Merge pull request #2280 from ogail/dev

Cutoff Singleton