chattr

merge queue: embarking main (b6e0665) and [#1948 + #1949] together

#1951

Closed