Merge changes from topic "transcode_parsing"

* changes:
  Switch from transcode option A to option B
  Improve package parsing for transcoding