Merge "Add meta-data denoting that a patch 25239169 is present." into main