158-B merge
[auto] problems compiled