chattr

merge queue: embarking main (da68771), #1855 and #1856 together

#1858

Closed