Transcoder mega commit
Merge fix