Closes #3402993
requested review from @yas
assigned to @baldwinlouie
approved this merge request
merged