Merge 3.9 changes back into develop