Merge pull request #11698 from SmithSamuelM/sam_raet_32

Fixed transactions so do not raise exception is unjoined or unallowed but drop transaction