Closes #2042
Updated Version 3.1.35