Merge "clatd: rework buffer sizes"