Merge branch 'et/add-chmod-x' into maint