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