Cherry-picked PR #436 and #451 into 3.x #464

Closed wes-johnson closed 1 year ago