rc: fix potential build warning
Merge with stable