3.6/dev intrepid lwright

#589 
#586 
#587 
#600 
#592 
#493