chattr

merge queue: checking main (93db24e) and #2838 together

#2840

Closed