[Review] /tg/ Merge May 20

Needs serious review and checking for issues and unwanted changes.