Merge "Implement finishOperation in shell delegate" into main