squash-before-merge-47716dfacab04f72