Merge "dx: Revise interface method handling"