Just a notice that I started working on a modernized version of #7599.