New code base for stable branch