Fix issues caused by opening both direct and indirect

Refs #9966
Merge branch 'bugfix/9966_split_direct_and_indirect_interfaces' into develop