BZ:1000403 - Functions not recognized

(cherry picked from commit 5e98b7a6b4719bfabbc7e55f79b450184b6340de)