Bug fix for !68913

Dan Guestrequested to merge
dguest/athena:fixflag into 24.0

The changes in !68913 (merged) broke asdict(). I added a few unit tests for this situation, and (I think) fixed the problem.

Edited by Dan Guest

Merge request reports