Merge release/3.0.0 branch into develop branch
#2855
Merged
release/3.0.0 branch into develop branch
#2855