Merge "Catch exception when stopping OTP session twice" into tm-dev