Merge "decodemv cleanup/improvements"