Closes #1798
Updated Version 3.0.12.023