strzhao # PR #81214 adoption