Related to #1643 (closed).
draft https://docs.google.com/document/d/1v763lKqVDOB4ym0bHlNgZrxC5ZziwDEt2I7vOsCwMA4/edit#heading=h.adjrew7vlrzb