Merge "Empty interface IQuux which is completely unrelated to IBase and IBaz." into oc-dev