Closes #1994
Updated Version 3.1.23