Merging 'StashCleanup' into 'DevBranch'

Resolved many conflicts.
I should never try to do this ever again… -_-
Sync