#9260 merging UnvSoft code