This MR is a cleanup of !261 (closed) which is properly rebased after !227 (merged) and removed some unnecessary commits.