Merge "Fix version replacement when path"