Closes second half of issue #1845
Merge branch 'develop-importantissues' into develop
Updated Version 3.0.19.061