Update fork to match latest 4.5.1 and 8.1 code