Sync prims module with module2 branch.