Merge "Throw an exception in case of parameter mismatch of precomputed text" into pi-dev