Update fork to 0.40.19-r1