Keep the functions if they are passed in
Merge pull request #9595 from jacksontj/develop

Keep the functions if they are passed in