3.6/dev intrepid lwright

#518 
#441