Added static function handling to partial.
Merge branch 'develop'