timeout and risk management fix
new try
view fix
Merge branch 'develop'