Merge "Work around decoder slowness" into klp-dev