Refactor orphan_definitions to not rely on instance locations
#2148
Loading
orphan_definitions to not rely on instance locations
#2148