Local changes
Merged from changes at industrieStr