follow-up of !14 (merged)
this MR is built on top of !16 (merged) and !14 (merged) Both should be reviewed before.
I can rebase this MR accordingly afterwards if needed.