chattr

merge queue: embarking main (b6e0665) and #1859 together

#1947

Closed