1900 Change to save patch_index in the meta_dict
#1933
Merged
patch_index in the meta_dict
#1933