Merged with base to bring in serf modifications