v0.16.0 protected
79513210 · Merge branch 'cherry-pick-ec193918' into 'release/0.16' ·