Merge Fixes from 1.x branch to 2.x branch.

...umbs v1.5.