chattr

merge queue: checking main (64cdf8d), #2818 and #2831 together

#2833

Closed