Splitting this into a separate issue: #153