This is a vanilla issue, the bugfix covers this.
Not yet. It’s incoming though. I have to sort and manually add the changes. The one referred to was a specific recommendation Ank made
