110-A merge
fixes
[auto] problems compiled
fixes
[auto] problems compiled