8.5: cherry-pick bafa987 and aea0f04 from main #160

Closed mmat11 closed 1 year ago