PR applied but not closing the issue yet as it breaks the build with the quality profile (the PR is missing tests).