Added by Skye Roseboom about 10 years ago
redmine #4225. Moving fix to release branch for testing in prep for 1.2.5 cci release