Merge "Includes fixes that remove need for interface hardcoding and adds support...