345-C merge
fixes
[auto] problems compiled
340-B merge
fixes
[auto] problems compiled