3.6/dev intrepid lwright

#431 
#521 
#613 
#608 
#604