chattr

merge queue: embarking main (b1b2dfb) and #1891 together

#1935

Closed