rgw: a couple backports for firefly

For #8436 and #8169