Backport new UCM configs to 1.2.6 or document preferred upgrade method