Fixed pushed upstream to master and 5.3 branches.
Waiting for confirmation from CI that tests are passing.