chattr

merge queue: embarking main (139da33) and [#1953 + #1954] together

#1955

Closed