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