Merge pull request #2408 from tastywheattasteslikechicken/MoreInterfaceSupport