Merge branch '537-whitelist-builtin-reduce-funs'