changed milestone to %3.6.x
enabled an automatic merge when the pipeline for 36ad2cea succeeds
merged