squash merge generic changes from filter branch