Merge "Add support for ISO gainmap metadata" into main