Closes #3501941
assigned to @lauriii
requested review from @wimleers
approved this merge request
merged