WIP: Merge 1.3.4 dev changes with stable #1

Closed
IDeletedSystem64 wants to merge 6 commits from stable-1.3.4 into stable

6 commits