Closes #1796
Merge branch 'develop' into develop-importantissues
Updated Version 3.0.14.041