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