Unified builtins2 master merge

Updating unified-builtins with the changes commited to master.