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