Merge "Type hint against IResultWrapper in maintenance classes"