Merge release/3.0 to dev branch

Created this PR (merge of the release/3.0 branch to dev branch) because of some conflicts.