BZ:1000403 - Functions not recognized

(cherry picked from commit bdd0f9e27f0f9481bee6a1a4e95adbbc052b50ab)