Merge "Remove accidental restored extra invocation" into main