Preparing to merge codec branch into master