Were there any scuba scenes on Cannon
That may seem like a weird question to ask, but I know a lot of police/detective type show in the 60's and 70's did at least one episode that somehow involved diving. For instance, there's a Barnaby Jones where a scuba diver is murdered and Barnaby and his associates have to find the killer.
On Cannon, I recall one episode where Cannon himself gets in the water (with William Conrad kinda looking like a walrus in that black wetsuit), but were there any others I should be on the lookout for?