Update to AG crypto
Merge branch 'ag-crypto'