Merge branch 'tg/add-chmod+x-fix'