Merge ""Revert^6 "CHA for interface method.""""