TUP-1878: fixed the calc import item issue for DQ.
Merge branch 'maintenance/5.6'