Bugfix in Settings. Wildcard components.
Merge origin/master