Just adding here a link to the PR created by @ric9k. This was already approved and merged in by @slava.
@ric9k, would you mind marking this as fixed if you’re satisfied that it is (or let me know and I’ll do it)?