I'm seeing three different fixes in this PR, two of which are already present in other PRs.
Also this PR cannot be merged due to conflicts :(
Pull-Request has been closed by artiladdha53