Merge 1.13.7 branch without clearing profiles
Merge branch 'nobuttons-1.13.7' into nobuttons