cosmetic(ish): remove superfluous module prefix
merge stable into default