Better buffering in all Clients

Early 2021 clean-up: duplicate