Address changes from picodata@72920175 (24.5.0-373)
mentioned in commit 5778e92d
mentioned in commit 323ffe9d