3.6/dev intrepid lwright

#617 
#598 
#596 
#585 
#593 
#588