Closes #3457454
started a merge train
enabled automatic add to merge train when the pipeline for 393f5d5e succeeds
merged