Merges !421 (closed) and !397 (closed). I suggest we close those two MRs and move any discussion here.