Created by: felixfbecker
This is an important fix we need to get into 3.21
Push commits to the source branch or add previously merged commits to review them.
