3.6/dev intrepid lwright

#497 
#525 
#482 
#485 
#440 
#516 
#484
#523