Merge branch 'ups_0.10.4'
Adding latest of UPS