Merge "Type hint against IResultWrapper in api classes"