NXP-15211 don't automatically close mapper in non-transactional mode