to avoid conflict
sync witdh develop
use getNamespace()
sync witdh develop