Merge "Add support for max res decode" into lmp-dev