Merge branch 'ups_0.10.4'