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

Cutoff Singleton
Merge remote-tracking branch 'upstream/dev' into dev