Updated to version 3.1.0-2096621

Closes #7584.