346-B merge
fixes
[auto] problems compiled