Release 0.4 of feature-switching