less test noise
merge stable into default