An additional fix for #17080
Merge pull request #18062 from jacksontj/2014.7

An additional fix for #17080