Merge develop
into master
for release
#3344
Merged
develop
into master
for release
#3344