Small fix on instrument import from setup data due to merge conflicts