Fix https://github.com/rec/echomesh/issues/472
Merge