V1.1 correction
327-A merge
fixes
[auto] problems compiled
V1.0 zoloogg
325-E merge
[auto] problems compiled