Adding in ams-enc to master branch
Merge remote-tracking branch 'origin/master' into dfmem+dma