Merge "Cherry-pick fix for 1.2.11 deterministic output regression"