Merge "Better workaround for slow decoders." into klp-dev