Merge branch 'ps/abbrev-length-before-setup-fix'