MapVeto + Backup System Beta + Some fix
Merge remote-tracking branch 'upstream/beta' into beta