2.1.6
b51cdd31 · Cherry-pick changes from #3489991. ·