Merge branch 'async-nif'