Switched from the service locator pattern to singleton pattern
Merge branch 'dev' into dev-char