Release 1.16.1.1 alpha ADM integration tests (and possibly others) fixed
merged 2 files from xnta
merge with asto
Merge pull request #601 from Bohdan-Tereta/development

To issue #599