Merge "Added accountStore id to prevent conflicts during gzip" into v2.0