The upstream merged the change for UCM now. The next release will include the support officially. Let's close this bug.