338-D merge
[auto] problems compiled
fixes
fixes
[auto] problems compiled