I used !1663 aiming to address #334, and this MR is the following step, addressing #333.
We can also skip #334 and go directly to #333, as discussed in !1663 (comment 8652311)
Closes #333