minor adjustments based on work done in .NET
Merge branch 'release-amp-3.1.1' of github.com:Berico-Technologies/AMP into release-amp-3.1.1