merge latest evervolv source