Updating UMS for erikcas stock kernel
Merging updated sources and fixes (see git logs)