add singleton and persistentManager
add singleton and persistentManager
fix
Merge remote-tracking branch 'origin/master'