317-A merge
[auto] problems compiled