Closes #3469294
requested review from @slucero
assigned to @krisahil
approved this merge request
merged