Merge "Add logic for replacing maps for zip files"