merging etsy feature and rollout