First pass at #330 (H001058.yaml)