Merged origin/master and fixed some build errors for intrinsics.