325-A merge
fixes
[auto] problems compiled