Closes #1870 and Updated Version 3.1.21.042