Merging develop into release/3.9

Bug fixes made to 3.9 were inadvertently checked into develop and not the release branch.