squash-before-merge-7ec6365486eab276