Feature spec and repair of broken specs. [ci skip]