Merge Pinto-Server into Core.