splitting out ext functionals
Merge pull request #4114 from danmcp/master

Merged by openshift-bot