Merge pull request #2432 from danmcp/master

Merged by openshift-bot
get runtime extended other working