chattr

merge queue: queuing main (0ce10ff) and #2311 together

#2312

Closed