Squash commits (#17981)

Commit

3 years ago

Squash commits (#17981) Co-authored-by: Niels Rogge <nielsrogge@Nielss-MacBook-Pro.local>