Release 12 development 

Big merge