Merge branch 'function_pointers_visitor'