cc @quillmatiq, also re #2629
cc @quillmatiq, also re #2629