simplify even further
merge stable into default