Closes #1853
Updated Version 3.0.17.044