@jportela, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bpasero and @jrieken to be potential reviewers.

@jportela,
Thanks for having already signed the Contribution License Agreement. Your agreement was validated by Microsoft. We will now review your pull request.
Thanks,
Microsoft Pull Request Bot

@jportela thanks, I was accidentally already working on a solution for this one, but did not push. My solution reuses the same code we had already to detect this case (see 35a12c9).

Nevertheless I will make sure that you get mentioned in the credits file for the May release notes 👍