chattr

merge queue: checking main (f2f680c), #2396 and #2397 together

#2399

Closed