Addresses #5023 Fix import comments