pulling in latest dagoba changes X3