Closes #1899
Updated Version 3.1.12