Move context instance edit button to sidebar
Merge branch 'develop' into geo