Starting adding reliability to Joiner transaction
fixed typo
Merge remote-tracking branch 'upstream/develop' into sam_raet_12
fixed conflict
Merge pull request #10749 from SmithSamuelM/sam_raet_12

Sam raet 12 Fixed conflict with Tom