Closes issue #1972
Merge branch 'develop' into fixforissue1972
Updated Version 3.1.21.047