v0.16.2 protected
8d62212f · Merge branch 'cherry-pick-30bcd534' into 'release/0.16' ·