3304969 Adding changes already in the 9.1.x branch to the 9.1.12 branch.
Bringing the changes already made in the 9.1.x branch into 9.1.12 to make a patch. Closes #3304969
Bringing the changes already made in the 9.1.x branch into 9.1.12 to make a patch. Closes #3304969