See more info in #17803 issue
@sajolida please tell me if there's anything you need to know for writing this. I know that this time the details are a bit tricky.