change a few functions to package private
Merge branch 'develop'