Temporary MR for testing only; adds #3409409, otherwise tests don't succeed.
approved this merge request