Closes #3508243
approved this merge request
enabled automatic add to merge train when checks pass
merged