-umm package issues (reverse-merged from commit 88d3d6c57bb77997ccb9c6c1da29388fdad7ba9b)