Change the way to wrap logger to enable switch logger after created.
Merge origin/develop