Backport the following commits from master to rel-810: - c5916f4633 - fix(upgrade): normalize categories_seq instead of unsafe multi-row UP… (#12194)
Backport the following commits from master to rel-810: