Merge "Add <interface> / <instance> to dev compat mat"