s4-common: prepare for evervolv