Merge branch 'tr/config-multivalue-lift-max'