backport from ump rev. 1442, please verify
Changeset view not shown, since the number of files (27) exceeds 20