This MR is a follow up on !46 (merged). More context on this given in #32 (comment 2930469).
This MR contains 3 commits :