On Singleton
Merge branch 'singleton'