Re #8074. Don't edit instrument without grouping.
Merge branch 'feature/8074_alignandfocus' into develop