Patch-210517

6602851-niq1@users.noreply.gitlab.com

7e4f6b5f · Merge branch 'beta' into 'live' · May 15, 2021

Live server after May 17th 2021 patch.