The issue is marked as fixed on 5.4.17 but does not seem so. The PR was targeting master. Should I create a PR for branch 5.4?