Unified builtins2 master merge

Adding the latest modifications committed to master into unified-builtins.