TUP-2422: only deal with for DI items.
Merge branch 'maintenance/5.6'