Merge "Replace function type in interface w/ reflectable version" into main