changed milestone to %3.6.x
requested review from @Skantes
enabled an automatic merge when the pipeline for 9b7c82cf succeeds
merged