Merge "Move (some) codecs into the codec process" into nyc-dev