Merge "modify cleanupStuckCalls shell command" into main