MSINM-54: Update transaction handling for legacy MSI and NM imports