.07.3: Update with upstream

By Jul.1 2:06 am UTC-4, with change at globalScale to 3