7.x um 38

https://discoverygarden.atlassian.net/browse/UM-38