Merge branch '2678-reel-break' into v2.17.x