backport from trunk (rev #9858)

fixed issue with hanged transactions in case one forked branch fails to be sent