Merge "WIP: Multiple decoder instances support"