Updated to version 3.1.0-2096621

Closes #7584.
Merge pull request #7614 from vitorgalvao/fix-7584

Updated to version 3.1.0-2096621