Extend functional utils
Merge pull request #1313 from Gozala/bug/functional@854982

Bug 854982 - Extend functional utils. r=@jsantell