Merge pull request #1584 from danielboulby-arm/db/Switches

Ensure the flow through switch statements is clear