fix: avoid naming conflict with client
prop
#7024
+874
−9
Merged
client
prop
#7024