Follow-up from MR #227 . Kept as a separate issue and milestone as I don't want to delay milestone v0.8 further.