getInstance is public
Merge origin/master