Merge `master` branch back into `dev`#7776

Merged

triallax merged 5 commits intoTeamNewPipe:devfrom

litetex:merged-master-into-dev-v0.21.16

Feb 3, 2022

Commits on Feb 3, 2022

Fixed merge conflict

litetex
and
triallax
authored