DEVALGO-2897 - generalized remapping