I have re-rolled it against 9.3.x and updated fix from #80.