Merge "Refactor to InterfaceParams utility class"