It's a reworked patch for !988 (closed), which fixes #1648 (closed).
Hopefully it will be the final version 😄
