Fix for compound association edge case with extended InstrumentDevice and PlatformDevice