317-D merge
fixes
[auto] problems compiled