Adding 'withoutFeature' tag, and other changes.

This is one commit ahead of the previous pull request.