Merge Conflict Resolution (from 8.0.x to 8.1.x)#937

semaphore-agent-production[bot] merged 4 commits into8.1.xconfluentinc/common:8.1.xfrom

pr_merge_from_8_0_x_to_8_1_xconfluentinc/common:pr_merge_from_8_0_x_to_8_1_xCopy head branch name to clipboard