Added a new uber feature
Merge test into release