DP-242

Update our trunk to be in sync with the apache fork.