[DF-5025] Enable mapping