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