Merge pull request #7467 from mikeller/reorganise_interfaces