UFiosp - make it use generics
Merge remote-tracking branch 'origin/4.5.2' into 4.5.2