Merge "Favor interfaces"