Merge pull request #9265 from nxhack/libupm_2.0.0