Suggested by @marco-c Related to #6400
Suggested by @marco-c
Related to #6400