PIN-2649: finishing import adjustments

Pavel Kraus requested to merge quanti/pin-2649-finishing-import-adjustments into develop Jan 26, 2022