Merge "Fix import logging"