Merge pull request #6110 from daverodgman/add-missing-break-2.28

Add missing break - backport 2.28