Xaroth -Add: Experimental support for changes in r25845