squash-before-merge-ab5a9a5222bca6e1