CAY-1946 CDbimport improvements

a squashed commit of the branch CAY-1946_1 which is a result of a series of pull requests
by Alex Kolonitsky