Merge release/3.0 to dev branch

Done in a separate branch because of conflicts.