chattr

merge queue: embarking main (c6be3aa), #601 and #602 together

#603

Merged