Merge remote-tracking branch 'upstream/stable' into merge_stable merged-on-behalf-of: Petar Kirov <ZombineDev@users.noreply.github.com>