Industry 0.6 

Update to the industry PR to match that of 0.6