Move variable declaration inside define - #9525

This pull request can be added to the merge queue.

Use @Mergifyio queue or the Mergify dashboard to queue this pull request for merging.