8-E merge
[auto] problems compiled