Merge pull request #11680 from UtahDave/develop

add missing import
add another missing import