Missed some commits in !12 (merged) so making an MR again to compensate.
Thanks @HashikD! lgtm.
merged