@Henri No: I found a few other PRs that have the same, or similar, fixes. I've given all three to the engineering team, but prioritized the two that are focused just on this change and don't introduce other changes. I'm not sure which specific PR they will merge/release, so just wanted to give you the heads up in case you see yours get marked as a duplicate.