Merge branch 'refs/heads/master' into develop
Moved private functions inside exports fn.
Merge branch 'refs/heads/develop'