Merge branch 'feature/wrapavcodec'