merge 3.33 into default
idk if this is the thing we want to do after yesterday sprint or if you want to have another solution like dropping python 3.6 support in the upcoming release?
but it was fast to do and we generally merge back everything in the newest branches
also see !363 (closed) for 3.32 into 3.33 that was also missing