Synchronize changes from 1.6 master branch [ci skip]

79dea1c Temporarily evert "Fix vehicle upgrades for assigned vehicles (#4114)" for until it's stable (to be combined with #4128 when re-introduced)

Author: github-actions[bot]