Closes #1795
Closes #1799
Updated Version 3.0.12.029