clean up feature specs
Merge branch '08_features' into 09_speedup