v0.5.0 protected
d4020723 · Merge branch 'cherry-pick-2879a238' into 'release/0.5' ·