FEDX-1997: adjust manageAndReturnTypedDisposable
#964
Merged
manageAndReturnTypedDisposable
#964