CC-5036: Add back edit show instance functionality