[SNAP-17] Saving a product takes too long