chattr

merge queue: checking main (41925d3) and [#2496 + #2497] together

#2498

Closed