Fix for export/import tempKey bug - D2612