chattr

merge queue: embarking main (80b9271) and #1859 together

#1941

Closed