Added static core functions to their own list.
Merge branch 'develop'