merge release_v4.0.0 into develop and solve merge conflicts

1 job for fix_update_develop_with_v4.0.0_changes in 51 seconds (queued for 14 seconds)