359-C merge
[auto] problems compiled