merged customizations with upstream update