Merge remote-tracking branch 'origin/feature/9089_icat_keep_alive'
Refs #9229 fix interface filename bug
Merge branch 'feature/9229_SCD_interface_bug' into develop